details: /erp/devel/pi-engdev/rev/ef2cfd4b2a7a
changeset: 6975:ef2cfd4b2a7a
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Fri Apr 09 14:05:03 2010 +0530
summary: Fixes issue 12387: It is possible to add some records when a Work
effort is processed
details: /erp/devel/pi-engdev/rev/3df698af8ada
changeset: 6976:3df698af8ada
user: Balamurugan Ramadoss <balamurugan.ramadoss <at> openbravo.com>
date: Fri Apr 09 14:39:57 2010 +0530
summary: Fixes Issue 12466: Not Posted Transaction Report doesn't show the
records.
details: /erp/devel/pi-engdev/rev/56038a11b9db
changeset: 6977:56038a11b9db
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri Apr 09 11:58:37 2010 +0200
summary: Fixed issue 12833. Now compile warnings will not appear in the
rebuild window, as they are not relevant for common users.
details: /erp/devel/pi-engdev/rev/7e9e2ac8a348
changeset: 6978:7e9e2ac8a348
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Fri Apr 09 16:05:56 2010 +0530
summary: Fixes issue 12387: It is possible to add some records when a Work
effort is processed
details: /erp/devel/pi-engdev/rev/aadbbebc99d1
changeset: 6979:aadbbebc99d1
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Fri Apr 09 16:21:01 2010 +0530
summary: Fixes issue for invalid function error
details: /erp/devel/pi-engdev/rev/a3bbaccec99f
changeset: 6980:a3bbaccec99f
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Apr 09 15:34:38 2010 +0200
summary: fixed bug 12921: User info pop-up window: Default organization is
not working
details: /erp/devel/pi-engdev/rev/e809fe06034d
changeset: 6981:e809fe06034d
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Fri Apr 09 16:05:37 2010 +0200
summary: Fixed 12502: Make decimalformat used by renderJR fully configurable
via Format.xml format name euroInform
details: /erp/devel/pi-engdev/rev/5c592e20669a
changeset: 6982:5c592e20669a
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Fri Apr 09 18:50:30 2010 +0200
summary: Fixes issue 12824: api check build 327
details: /erp/devel/pi-engdev/rev/6c78ad9d5176
changeset: 6983:6c78ad9d5176
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Fri Apr 09 19:17:41 2010 +0200
summary: Fixes issue 12824: api check build 327
details: /erp/devel/pi-engdev/rev/b535611b2394
changeset: 6984:b535611b2394
user: Martin Taal <martin.taal <at> openbravo.com>
date: Fri Apr 09 21:11:28 2010 +0200
summary: fixes issue 12918: DAL: Exception in commitTransaction leaves
Postgres connection in illegal state
details: /erp/devel/pi-engdev/rev/253f727de17e
changeset: 6985:253f727de17e
user: Martin Taal <martin.taal <at> openbravo.com>
date: Fri Apr 09 21:12:35 2010 +0200
summary: fixes issue 12901: OBDal.getInstance().getConnection() does not
setup dateFormat correctly
details: /erp/devel/pi-engdev/rev/7c1c258cd756
changeset: 6986:7c1c258cd756
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Mon Apr 12 12:08:44 2010 +0530
summary: Fixes issue 12454: Errors in Daily Work Requirements Report
details: /erp/devel/pi-engdev/rev/299a742a8ee4
changeset: 6987:299a742a8ee4
user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com>
date: Mon Apr 12 12:47:59 2010 +0530
summary: Fixes Issue 12851: The Proposed field dont have the format or
precision
details: /erp/devel/pi-engdev/rev/26d7079c342c
changeset: 6988:26d7079c342c
user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com>
date: Mon Apr 12 14:12:19 2010 +0530
summary: Review comments of Tax Posting as an Expenses has updated.
details: /erp/devel/pi-engdev/rev/8f25c4e19a64
changeset: 6989:8f25c4e19a64
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Mon Apr 12 16:01:38 2010 +0530
summary: Code re-factoring for issue #12454 and #12387:
details: /erp/devel/pi-engdev/rev/82cda6a18365
changeset: 6990:82cda6a18365
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Mon Apr 12 13:43:10 2010 +0200
summary: Fixes lib/runtime/ojdbc6.jar, it was modified by error
details: /erp/devel/pi-engdev/rev/34903830bf34
changeset: 6991:34903830bf34
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Apr 12 16:09:13 2010 +0200
summary: fixed bug 12934: The datetime reference does not work properly
details: /erp/devel/pi-engdev/rev/5a4b087b9a7e
changeset: 6992:5a4b087b9a7e
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Mon Apr 12 16:18:45 2010 +0200
summary: Added log message for translation consistency in export.database
details: /erp/devel/pi-engdev/rev/91219b829738
changeset: 6993:91219b829738
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Mon Apr 12 16:39:13 2010 +0200
summary: Fixed issue 12942. org.openbravo folders will no longer be created
inside modules, when compiling build validations or module scripts.
details: /erp/devel/pi-engdev/rev/631c626866c1
changeset: 6994:631c626866c1
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Mar 12 22:44:06 2010 +0100
summary: Update AD_MODULE version for obx generation
details: /erp/devel/pi-engdev/rev/0f90d9ba03f9
changeset: 6995:0f90d9ba03f9
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Tue Mar 16 08:46:40 2010 +0100
summary: Merge stable changesets from int to main
details: /erp/devel/pi-engdev/rev/3e52c5b52d67
changeset: 6996:3e52c5b52d67
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Tue Mar 16 08:46:42 2010 +0100
summary: Update AD_MODULE version for obx generation
details: /erp/devel/pi-engdev/rev/b5e906b8ffdd
changeset: 6997:b5e906b8ffdd
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Mar 17 09:06:57 2010 +0100
summary: Merge stable changesets from int to main
details: /erp/devel/pi-engdev/rev/859b8a1e96e9
changeset: 6998:859b8a1e96e9
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Mar 17 09:06:58 2010 +0100
summary: Update AD_MODULE version for obx generation
details: /erp/devel/pi-engdev/rev/acdaec12dda3
changeset: 6999:acdaec12dda3
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Mar 17 14:01:11 2010 +0100
summary: Merge stable changesets from int to main
details: /erp/devel/pi-engdev/rev/83c618c2aa79
changeset: 7000:83c618c2aa79
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Mar 17 14:01:13 2010 +0100
summary: Update AD_MODULE version for obx generation
details: /erp/devel/pi-engdev/rev/88d0c9a94907
changeset: 7001:88d0c9a94907
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Mar 17 20:29:40 2010 +0100
summary: Merge stable changesets from int to main
details: /erp/devel/pi-engdev/rev/610225e88ac0
changeset: 7002:610225e88ac0
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Mar 17 20:29:41 2010 +0100
summary: Update AD_MODULE version for obx generation
details: /erp/devel/pi-engdev/rev/cfb0397e2203
changeset: 7003:cfb0397e2203
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Thu Mar 25 10:05:44 2010 +0100
summary: Fixes issue 0012788: Precision error in simple sales order & sales
invoice
details: /erp/devel/pi-engdev/rev/3601ba418420
changeset: 7004:3601ba418420
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Thu Mar 25 17:00:17 2010 +0530
summary: Fixes Issue 10487: Sales Order report throwing error while taking
PDF(Print) report.
details: /erp/devel/pi-engdev/rev/e02aeb49efee
changeset: 7005:e02aeb49efee
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Thu Mar 25 19:10:15 2010 +0100
summary: Fixed 12811.Issue in the General Ledger Report pagination with
previous balance.
details: /erp/devel/pi-engdev/rev/1abbe20a8163
changeset: 7006:1abbe20a8163
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Tue Mar 23 17:15:36 2010 +0100
summary: Fixes bug 0012773: Not possible to cancel a manual settlement
details: /erp/devel/pi-engdev/rev/bfe2f1c60f82
changeset: 7007:bfe2f1c60f82
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Thu Mar 25 19:35:51 2010 +0100
summary: Fixes bug 0012773: Not possible to cancel a manual settlement
support for multi-currency, the isreceipt value
and write off amounts
details: /erp/devel/pi-engdev/rev/13067de6a64b
changeset: 7008:13067de6a64b
user: Ben Sommerville <ben.sommerville <at> eintel.com.au>
date: Sat Mar 20 11:24:25 2010 +1100
summary: Fixes 12907 : Remove calls to setProcessingMode
details: /erp/devel/pi-engdev/rev/ee181c6ac1ba
changeset: 7009:ee181c6ac1ba
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Mar 26 19:52:05 2010 +0100
summary: Fixed issues 12097 and 12795: Now no problems with IE and
setProcessingMode
details: /erp/devel/pi-engdev/rev/5448a6a56c01
changeset: 7010:5448a6a56c01
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Tue Mar 30 11:01:49 2010 +0200
summary: Reverting changes in issue 0012788: Precision error in simple sales
order sales invoice
details: /erp/devel/pi-engdev/rev/f66cde17a9f0
changeset: 7011:f66cde17a9f0
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Tue Mar 30 18:18:10 2010 +0530
summary: Fixes Issue 12845: User Not able to create purchase order using Copy
lines option.
details: /erp/devel/pi-engdev/rev/17a70403b6d3
changeset: 7012:17a70403b6d3
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Mar 31 12:07:41 2010 +0200
summary: Update AD_MODULE version to 2.50MP14
details: /erp/devel/pi-engdev/rev/8df12cedf6a2
changeset: 7013:8df12cedf6a2
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Mar 31 12:07:42 2010 +0200
summary: Added tag 2.50MP14 for changeset 17a70403b6d3
details: /erp/devel/pi-engdev/rev/98c8bc5a4580
changeset: 7014:98c8bc5a4580
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Mar 31 12:07:43 2010 +0200
summary: Added signature for changeset 8df12cedf6a2
details: /erp/devel/pi-engdev/rev/1496721b0f85
changeset: 7015:1496721b0f85
user: Juan Pablo Aroztegi <juanpablo.aroztegi <at> openbravo.com>
date: Mon Apr 12 17:18:01 2010 +0200
summary: Merge from main, import tags
details: /erp/devel/pi-engdev/rev/53afa94b169e
changeset: 7016:53afa94b169e
user: Juan Pablo Aroztegi <juanpablo.aroztegi <at> openbravo.com>
date: Mon Apr 12 17:18:47 2010 +0200
summary: AD_MODULE: update core rev number and label
details: /erp/devel/pi-engdev/rev/3f8d0dedca3c
changeset: 7017:3f8d0dedca3c
user: Juan Pablo Aroztegi <juanpablo.aroztegi <at> openbravo.com>
date: Mon Apr 12 17:21:04 2010 +0200
summary: Merge yet again
details: /erp/devel/pi-engdev/rev/355270aa46dc
changeset: 7018:355270aa46dc
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Thu Apr 08 12:10:57 2010 +0200
summary: Fixes issue 0012864: While Generating payment Plan...
details: /erp/devel/pi-engdev/rev/4e50d53e793d
changeset: 7019:4e50d53e793d
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Thu Apr 08 17:08:22 2010 +0200
summary: Fixes bug 0012870: Last calculated date
details: /erp/devel/pi-engdev/rev/606458ba51ee
changeset: 7020:606458ba51ee
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Thu Apr 08 18:56:24 2010 +0200
summary: Fixes issue 0012898: In Make payment window, in BP selector window
customer radio is selected by default.
details: /erp/devel/pi-engdev/rev/2a8e45df556f
changeset: 7021:2a8e45df556f
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Mon Apr 12 18:26:23 2010 +0200
summary: Merge heads after transplants.
details: /erp/devel/pi-engdev/rev/6bd4524448a7
changeset: 7022:6bd4524448a7
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Mon Apr 12 19:02:43 2010 +0200
summary: Fixes issue 0012708: If you fill a field with the maximum length
permited and one of the character is special it fails when saving
details: /erp/devel/pi-engdev/rev/3c3bac424451
changeset: 7023:3c3bac424451
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Tue Apr 13 09:39:13 2010 +0200
summary: Fixes issue 12501: Install Now doesn't trigger install all updates
details: /erp/devel/pi-engdev/rev/1891c18ea6d4
changeset: 7024:1891c18ea6d4
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Tue Apr 13 12:29:45 2010 +0200
summary: Related to issue 12892: Improved IE visualization
details: /erp/devel/pi-engdev/rev/92fd7db0c95d
changeset: 7025:92fd7db0c95d
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Tue Apr 13 12:32:40 2010 +0200
summary: Related to issue 12364: Fixed execution url to be able to execute it
in any depth
details: /erp/devel/pi-engdev/rev/386a43438f36
changeset: 7026:386a43438f36
user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com>
date: Tue Apr 13 16:19:56 2010 +0530
summary: Fixes Issue 12757: Error when you print on General Ledger Journal
details: /erp/devel/pi-engdev/rev/d301591fbf60
changeset: 7027:d301591fbf60
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Apr 13 13:03:01 2010 +0200
summary: fixed bug 12363: An error on Report Remittance
details: /erp/devel/pi-engdev/rev/1ce150c2d5d1
changeset: 7028:1ce150c2d5d1
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Tue Apr 13 13:19:40 2010 +0200
summary: Related to issue 12737: Changed callout logic of
SL_RequisitionLine_Product.java
details: /erp/devel/pi-engdev/rev/7bdfb9074ae5
changeset: 7029:7bdfb9074ae5
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Tue Apr 13 13:50:24 2010 +0200
summary: Fixes issue 0012951: Make consistent not data found messages in
General Ledger and Trial Balance reports
details: /erp/devel/pi-engdev/rev/4ae39f38c46b
changeset: 7030:4ae39f38c46b
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Tue Apr 13 13:52:37 2010 +0200
summary: merge
details: /erp/devel/pi-engdev/rev/971f3104d8ec
changeset: 7031:971f3104d8ec
user: Martin Taal <martin.taal <at> openbravo.com>
date: Tue Apr 13 15:30:22 2010 +0200
summary: Solved typo in message
details: /erp/devel/pi-engdev/rev/cd3fd202b71d
changeset: 7032:cd3fd202b71d
user: Martin Taal <martin.taal <at> openbravo.com>
date: Tue Apr 13 15:32:14 2010 +0200
summary: Solved typo in message
details: /erp/devel/pi-engdev/rev/e3451d9eeb7a
changeset: 7033:e3451d9eeb7a
user: Martin Taal <martin.taal <at> openbravo.com>
date: Tue Apr 13 15:39:28 2010 +0200
summary: Repaired copyright year
details: /erp/devel/pi-engdev/rev/825f121b6164
changeset: 7034:825f121b6164
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Apr 13 19:11:31 2010 +0200
summary: Fixed issue 12786. Views will no longer be changed when exported
from PostgreSQL 8.4
details: /erp/devel/pi-engdev/rev/068edc851241
changeset: 7035:068edc851241
user: Salvador Zapata <salvador.zapata <at> openbravo.com>
date: Tue Apr 13 19:58:44 2010 +0200
summary: fixed issue: 12498
details: /erp/devel/pi-engdev/rev/f549fe3f7592
changeset: 7036:f549fe3f7592
user: Salvador Zapata <salvador.zapata <at> openbravo.com>
date: Tue Apr 13 20:00:34 2010 +0200
summary: Merge for issue 12498
details: /erp/devel/pi-engdev/rev/09ade1f8f1d6
changeset: 7037:09ade1f8f1d6
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Tue Apr 13 20:07:42 2010 +0200
summary: Fixes issue 12957. Removed procedures that belong to the Advanced
Payables and Receivables module.
details: /erp/devel/pi-engdev/rev/fb76578923df
changeset: 7038:fb76578923df
user: Salvador Zapata <salvador.zapata <at> openbravo.com>
date: Tue Apr 13 20:56:39 2010 +0200
summary: Fixed issue 12498: Product complete selector
details: /erp/devel/pi-engdev/rev/bef45fc2f631
changeset: 7039:bef45fc2f631
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Tue Apr 13 23:40:08 2010 +0200
summary: Fixes bug 0012962: Invoice and orders business partner callouts
details: /erp/devel/pi-engdev/rev/81522f10575a
changeset: 7040:81522f10575a
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Tue Apr 13 23:47:16 2010 +0200
summary: Fixes bug 0012963: Some procedures are not loading payment method
details: /erp/devel/pi-engdev/rev/792f32a43833
changeset: 7041:792f32a43833
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Apr 14 01:25:05 2010 +0200
summary: Removed not needed column.
details: /erp/devel/pi-engdev/rev/3ca2714ac0ef
changeset: 7042:3ca2714ac0ef
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Wed Apr 14 09:41:50 2010 +0200
summary: Fixes erp_devel_int-pgsql-db-full-consistency-test build #420
details: /erp/devel/pi-engdev/rev/2aac4501bbd5
changeset: 7043:2aac4501bbd5
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Wed Apr 14 11:56:39 2010 +0200
summary: Related to issue 12786. Slightly modified views so that they don't
change in Oracle too.
details: /erp/devel/pi-engdev/rev/f6069809175e
changeset: 7044:f6069809175e
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Wed Apr 14 12:57:46 2010 +0200
summary: Fixes issue 0012959: You can give the Systemadministrator orgaccess
to an organization other than *
details: /erp/devel/pi-engdev/rev/3790dbece4c1
changeset: 7045:3790dbece4c1
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Wed Apr 14 13:04:11 2010 +0200
summary: Fixes issue 0012969: Make consistent Write-Off Amount column
details: /erp/devel/pi-engdev/rev/aff3aa6043bd
changeset: 7046:aff3aa6043bd
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Apr 14 13:39:29 2010 +0200
summary: Added Configuration Properties architecture including Customer
Credit Used property.
details: /erp/devel/pi-engdev/rev/272c7afcde0d
changeset: 7047:272c7afcde0d
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Wed Apr 14 13:56:45 2010 +0200
summary: Fixes issue 12933: add readonly logic to Payment Method
(C_Invoice/C_Order)
details: /erp/devel/pi-engdev/rev/a5efd85259fb
changeset: 7048:a5efd85259fb
user: Martin Taal <martin.taal <at> openbravo.com>
date: Wed Apr 14 13:58:03 2010 +0200
summary: Removed test case which depended on yuicompressor in WEB-INF/lib
details: /erp/devel/pi-engdev/rev/0c04f0b38173
changeset: 7049:0c04f0b38173
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Wed Apr 14 14:54:44 2010 +0200
summary: Related to issue 12786. In PostgreSQL, an additional line will not
be added sometimes.
details: /erp/devel/pi-engdev/rev/9c230b478c15
changeset: 7050:9c230b478c15
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Wed Apr 14 16:43:54 2010 +0200
summary: Fixes issue 0012959: You can give the Systemadministrator orgaccess
to an organization other than *
details: /erp/devel/pi-engdev/rev/39a40ec8d089
changeset: 7051:39a40ec8d089
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Wed Apr 14 16:45:25 2010 +0200
summary: Fixed bug 12460: Update Depreciated Plan field
details: /erp/devel/pi-engdev/rev/6ca418d311b9
changeset: 7052:6ca418d311b9
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Wed Apr 14 17:12:01 2010 +0200
summary: Fixed issue 12975. BuildValidationHandler will not longer fail on
Windows.
details: /erp/devel/pi-engdev/rev/6004d7e2775e
changeset: 7053:6004d7e2775e
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Apr 14 17:20:55 2010 +0200
summary: Fixes inconsistency issue 348. Return '-' if propery value is null.
Manage selected flag.
details: /erp/devel/pi-engdev/rev/68d20116dbd8
changeset: 7054:68d20116dbd8
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Wed Apr 14 18:56:54 2010 +0200
summary: FIN_Payment Status reference list and validation
details: /erp/devel/pi-engdev/rev/d9090afa8a8d
changeset: 7055:d9090afa8a8d
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Wed Apr 14 19:10:46 2010 +0200
summary: Fixed bug 11438: Hide Post button for not direct posting
details: /erp/devel/pi-engdev/rev/6f8665876963
changeset: 7056:6f8665876963
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Apr 14 19:16:02 2010 +0200
summary: Added Payment Monitor property.
details: /erp/devel/pi-engdev/rev/675f5d15388d
changeset: 7057:675f5d15388d
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Wed Apr 14 20:01:17 2010 +0200
summary: Columns modifications for APRM and fixes in Payment status ref list
details: /erp/devel/pi-engdev/rev/bfab11cae58d
changeset: 7058:bfab11cae58d
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Wed Apr 14 20:07:49 2010 +0200
summary: Merge with pi revision 7045:675f5d15388d (14/04/10)
diffstat:
.hgsigs
| 1 +
.hgtags
| 1 +
lib/runtime/ojdbc6.jar
| 0
src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java
| 8 +-
src-core/src/org/openbravo/modulescript/ModuleScriptHandler.java
| 32 +-
src-core/src/org/openbravo/utils/OBRebuildAppender.java
| 11 +-
src-db/database/lib/dbsourcemanager.jar
| 0
src-db/database/model/functions/AD_GET_PROPERTY_VALUE.xml
| 82 +
src-db/database/model/functions/C_BP_SOCREDITUSED_REFRESH.xml
| 24 +-
src-db/database/model/functions/C_GENERATEPOFROMPROJECT.xml
| 7 +-
src-db/database/model/functions/C_GENERATESOFROMPROJECT.xml
| 7 +-
src-db/database/model/functions/C_GENERATESOFROMPROJECTORDER.xml
| 8 +-
src-db/database/model/functions/C_GENERATESOFROMPROJECTPHASE.xml
| 12 +-
src-db/database/model/functions/C_INVOICE_CREATE.xml
| 10 +-
src-db/database/model/functions/C_INVOICE_POST.xml
| 4 +-
src-db/database/model/functions/FIN_GEN_PAYMENTSCHEDULE_INV.xml
| 448 ------
src-db/database/model/functions/FIN_GEN_PAYMENTSCHEDULE_ORD.xml
| 133 -
src-db/database/model/functions/MRP_WORKREQUIREMENT.xml
| 4 +-
src-db/database/model/tables/AD_PROPERTY_CONFIGURATION.xml
| 64 +
src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml
| 2 +-
src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT.xml
| 7 +
src-db/database/model/tables/FIN_PAYMENT_SCHEDULEDETAIL.xml
| 7 -
src-db/database/model/triggers/AD_ROLE_CHECK_TRG.xml
| 39 +
src-db/database/model/triggers/AD_ROLE_ORGACCESS_CHECK_TRG.xml
| 38 +
src-db/database/model/triggers/A_AMORTIZATIONLINE_TRG.xml
| 18 +-
src-db/database/model/triggers/C_BPARTNER_LOCATION_TRG.xml
| 2 +-
src-db/database/model/triggers/MA_PL_EMPLOYEE_TRG.xml
| 65 +
src-db/database/model/triggers/MA_PL_IC_TRG.xml
| 64 +
src-db/database/model/triggers/MA_PL_INVOICELINE_TRG.xml
| 66 +
src-db/database/model/triggers/MA_PL_MACHINE_TRG.xml
| 65 +
src-db/database/model/triggers/MA_TOOLSETUSED_TRG.xml
| 65 +
src-db/database/model/views/AD_AUDIT_TRAIL_V.xml
| 26 +-
src-db/database/model/views/AD_FIELD_V.xml
| 16 +-
src-db/database/model/views/AD_FIELD_VT.xml
| 18 +-
src-db/database/model/views/AD_PROCESS_EXECUTION_V.xml
| 4 +-
src-db/database/model/views/AD_REF_LIST_V.xml
| 16 +-
src-db/database/model/views/AD_TABLE_POST_V.xml
| 42 +-
src-db/database/model/views/AD_TAB_V.xml
| 6 +-
src-db/database/model/views/AD_TAB_VT.xml
| 8 +-
src-db/database/model/views/AD_USER_ROLES_V.xml
| 6 +-
src-db/database/model/views/AD_WINDOW_VT.xml
| 6 +-
src-db/database/model/views/A_ASSET_AMORTIZATION.xml
| 4 +-
src-db/database/model/views/C_BPARTNER_V.xml
| 8 +-
src-db/database/model/views/C_CASH_DETAIL.xml
| 4 +-
src-db/database/model/views/C_DEBT_PAYMENT_CANCEL.xml
| 4 +-
src-db/database/model/views/C_DEBT_PAYMENT_GENERATE.xml
| 4 +-
src-db/database/model/views/C_DEBT_PAYMENT_V.xml
| 40 +-
src-db/database/model/views/C_INVOICELINE_V.xml
| 20 +-
src-db/database/model/views/C_INVOICELINE_V2.xml
| 36 +-
src-db/database/model/views/C_INVOICE_CANDIDATE_V.xml
| 30 +-
src-db/database/model/views/C_INVOICE_CUSTOMERPRODQTR.xml
| 20 +-
src-db/database/model/views/C_INVOICE_CUSTOMERVENDQTR.xml
| 22 +-
src-db/database/model/views/C_INVOICE_DAY.xml
| 20 +-
src-db/database/model/views/C_INVOICE_HEADER_V.xml
| 22 +-
src-db/database/model/views/C_INVOICE_HEADER_VT.xml
| 22 +-
src-db/database/model/views/C_INVOICE_LINETAX_V.xml
| 96 +-
src-db/database/model/views/C_INVOICE_LINETAX_VT.xml
| 104 +-
src-db/database/model/views/C_INVOICE_MONTH.xml
| 20 +-
src-db/database/model/views/C_INVOICE_PRODMONTH.xml
| 20 +-
src-db/database/model/views/C_INVOICE_PRODWEEK.xml
| 20 +-
src-db/database/model/views/C_INVOICE_V.xml
| 44 +-
src-db/database/model/views/C_INVOICE_V2.xml
| 36 +-
src-db/database/model/views/C_INVOICE_VENDORMONTH.xml
| 22 +-
src-db/database/model/views/C_INVOICE_WEEK.xml
| 20 +-
src-db/database/model/views/C_ORDER_HEADER_V.xml
| 22 +-
src-db/database/model/views/C_ORDER_HEADER_VT.xml
| 22 +-
src-db/database/model/views/C_ORDER_LINETAX_V.xml
| 58 +-
src-db/database/model/views/C_ORDER_LINETAX_VT.xml
| 66 +-
src-db/database/model/views/C_ORDER_OPEN.xml
| 4 +-
src-db/database/model/views/C_PERIODCONTROL_V.xml
| 4 +-
src-db/database/model/views/C_PROJECTPROPOSAL_V.xml
| 4 +-
src-db/database/model/views/C_PROJECT_DETAILS_V.xml
| 16 +-
src-db/database/model/views/C_PROJECT_DETAILS_VT.xml
| 16 +-
src-db/database/model/views/C_PROJECT_HEADER_V.xml
| 24 +-
src-db/database/model/views/C_PROJECT_HEADER_VT.xml
| 24 +-
src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml
| 12 +-
src-db/database/model/views/FIN_PAYMENT_PROP_DETAIL_V.xml
| 16 +-
src-db/database/model/views/FIN_PAYMENT_SCHED_INV_V.xml
| 16 +-
src-db/database/model/views/FIN_PAYMENT_SCHED_ORD_V.xml
| 16 +-
src-db/database/model/views/FIN_RECONCILIATIONLINE_V.xml
| 4 +-
src-db/database/model/views/GL_JOURNALLINE_ACCT_V.xml
| 4 +-
src-db/database/model/views/MA_PROCESSPLAN_TOTALIZED.xml
| 36 +-
src-db/database/model/views/MA_SEQUENCE_EMPLOYEE_COST.xml
| 26 +-
src-db/database/model/views/MA_SEQUENCE_INDIRECT_COST_COST.xml
| 26 +-
src-db/database/model/views/MA_SEQUENCE_MACHINE_COST.xml
| 26 +-
src-db/database/model/views/M_INOUT_CANDIDATE_V.xml
| 12 +-
src-db/database/model/views/M_INOUT_HEADER_V.xml
| 18 +-
src-db/database/model/views/M_INOUT_HEADER_VT.xml
| 18 +-
src-db/database/model/views/M_INOUT_LINE_V.xml
| 26 +-
src-db/database/model/views/M_INOUT_LINE_VT.xml
| 30 +-
src-db/database/model/views/M_TRANSACTION_SUM.xml
| 6 +-
src-db/database/model/views/M_TRANSACTION_V.xml
| 4 +-
src-db/database/model/views/R_REQUEST_V.xml
| 4 +-
src-db/database/model/views/S_TIMEEXPENSELINE_V.xml
| 6 +-
src-db/database/sourcedata/AD_AUXILIARINPUT.xml
| 143 +
src-db/database/sourcedata/AD_COLUMN.xml
| 505 ++++++-
src-db/database/sourcedata/AD_DATASET_COLUMN.xml
| 11 +
src-db/database/sourcedata/AD_DATASET_TABLE.xml
| 14 +
src-db/database/sourcedata/AD_ELEMENT.xml
| 52 +-
src-db/database/sourcedata/AD_EP_PROCEDURES.xml
| 23 -
src-db/database/sourcedata/AD_FIELD.xml
| 744 +++++++++-
src-db/database/sourcedata/AD_MENU.xml
| 12 +
src-db/database/sourcedata/AD_MESSAGE.xml
| 24 +-
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
| 24 +
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
| 40 +
src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
src-db/database/sourcedata/AD_REFERENCE.xml
| 14 +
src-db/database/sourcedata/AD_REF_LIST.xml
| 139 +-
src-db/database/sourcedata/AD_TAB.xml
| 26 +-
src-db/database/sourcedata/AD_TABLE.xml
| 22 +
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
| 22 +
src-db/database/sourcedata/AD_TREENODE.xml
| 55 +-
src-db/database/sourcedata/AD_VAL_RULE.xml
| 12 +
src-db/database/sourcedata/AD_WINDOW.xml
| 17 +-
src-test/org/openbravo/test/javascript/CompressionTest.java
| 38 +
src-test/org/openbravo/test/javascript/test-compression.js
| 446 +++++
src-util/buildvalidation/build.xml
| 13 +-
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/Cbpvendoracct.class
| 0
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/CbpvendoracctData.class
| 0
src-util/buildvalidation/src/org/openbravo/buildvalidation/Cbpvendoracct.java
| 50 +
src-util/buildvalidation/src/org/openbravo/buildvalidation/Cbpvendoracct_data.xsql
| 37 +
src-util/modulescript/build.xml
| 11 +-
src-wad/src/org/openbravo/wad/datasource.xsqlxml
| 17 +-
src-wad/src/org/openbravo/wad/javasource.javaxml
| 2 +-
src/build.xml
| 6 +-
src/org/openbravo/base/secureApp/HttpSecureAppServlet.java
| 11 +-
src/org/openbravo/base/secureApp/LoginUtils.java
| 2 +
src/org/openbravo/dal/core/DalSessionFactory.java
| 13 +-
src/org/openbravo/dal/core/SessionHandler.java
| 14 +-
src/org/openbravo/dal/service/OBDal.java
| 21 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Bank.html
| 8 +-
src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java
| 20 +-
src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java
| 21 +-
src/org/openbravo/erpCommon/ad_callouts/SL_RequisitionLine_Product.java
| 4 +-
src/org/openbravo/erpCommon/ad_forms/DocInvoice.java
| 4 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java
| 8 +-
src/org/openbravo/erpCommon/ad_process/PaymentMonitor.java
| 6 +
src/org/openbravo/erpCommon/ad_process/PaymentMonitorProcess.java
| 13 +-
src/org/openbravo/erpCommon/ad_process/TestHeartbeat.java
| 3 +-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java
| 27 +-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java
| 33 +-
src/org/openbravo/erpCommon/ad_reports/ReportNotPosted_data.xsql
| 16 +-
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java
| 16 +-
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily.java
| 16 +-
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily_data.xsql
| 12 -
src/org/openbravo/erpCommon/ad_reports/SubreportWorkRequirementDaily.jrxml
| 2 +-
src/org/openbravo/erpCommon/businessUtility/BpartnerMisc_data.xsql
| 15 +-
src/org/openbravo/erpCommon/security/Login_F1.html
| 2 +-
src/org/openbravo/erpCommon/utility/PrintJR_data.xsql
| 10 +-
src/org/openbravo/erpCommon/utility/Utility.java
| 10 +
web/js/messages.js
| 8 +-
web/js/utils.js
| 2 +-
web/skins/Default/Openbravo_ERP_250.css
| 5 +-
153 files changed, 3878 insertions(+), 1611 deletions(-)
diffs (truncated from 8160 to 300 lines):
diff -r 511757e230d2 -r bfab11cae58d .hgsigs
--- a/.hgsigs Fri Apr 09 08:18:55 2010 +0200
+++ b/.hgsigs Wed Apr 14 20:07:49 2010 +0200
@@ -13,3 +13,4 @@
630f94155c011c18a4bd948239d674953ad729c4 0
iEYEABECAAYFAkthyKQACgkQCX/oGf+2qkOIwgCcCk4MJcMrnHR9WgEGfRx4HoTYfjsAn26YI0m1bCQSlyqmh+gDusmsqrNA
4a5dd51c34fbbf64e9f933f9b7d54589ef5fb7b9 0
iEYEABECAAYFAkuM+1EACgkQCX/oGf+2qkPHfgCdFKV1PxtXcckQ3R3+kJgXnRFAtgkAoM6eWuR1ZA3nRphHH7sX2SGoufA5
75b887d57378e59138c0362b928a504db568ed9b 0
iEYEABECAAYFAkuSHAsACgkQCX/oGf+2qkOEpwCeM6aKuQ/VK5ywylW5Jiki2L5YX0UAoPtzt8ELfu+2n0hTB2E36NgVq1IU
+8df12cedf6a200183c73497ae0cefa3fee0a0427 0
iEYEABECAAYFAkuzHu4ACgkQCX/oGf+2qkNkzwCeJC2mfV4HG3jDDH4B9ovaplpzyWwAoOQY9wuMO2XNnVJ9xw7JS+Qjy52k
diff -r 511757e230d2 -r bfab11cae58d .hgtags
--- a/.hgtags Fri Apr 09 08:18:55 2010 +0200
+++ b/.hgtags Wed Apr 14 20:07:49 2010 +0200
@@ -23,3 +23,4 @@
98d31cbff884dd20581e1cafad505ed8f9b33273 2.50MP11
1a6428c78a5521471084e7b93a42a03a74543495 2.50MP12
65aa17bbe739f7d3370aba319e68474c2356fdf2 2.50MP13
+17a70403b6d39988147a0b8a11bb3a57ed04c373 2.50MP14
diff -r 511757e230d2 -r bfab11cae58d lib/runtime/ojdbc6.jar
Binary file lib/runtime/ojdbc6.jar has changed
diff -r 511757e230d2 -r bfab11cae58d
src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java
--- a/src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java
Fri Apr 09 08:18:55 2010 +0200
+++ b/src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java
Wed Apr 14 20:07:49 2010 +0200
@@ -95,7 +95,7 @@
new Object[0]);
}
- private static void readClassFiles(List<String> coreClasses, File file) {
+ public static void readClassFiles(List<String> coreClasses, File file) {
ArrayList<String> newClasses = new ArrayList<String>();
readClassFilesExt(newClasses, file);
Collections.sort(newClasses);
@@ -114,8 +114,10 @@
} else {
if (file.getAbsolutePath().endsWith(".class")) {
String fileName = file.getAbsolutePath();
- fileName = fileName.split("build" + File.separatorChar + "classes" +
File.separatorChar)[1];
- coreClasses.add(fileName.replace(".class",
"").replace(File.separatorChar, '.'));
+ // Replace Windows separator characters by / to make replacement
simpler
+ fileName = fileName.replace("\\", "/");
+ fileName = fileName.split("build/classes/")[1];
+ coreClasses.add(fileName.replace(".class", "").replace('/', '.'));
}
}
}
diff -r 511757e230d2 -r bfab11cae58d
src-core/src/org/openbravo/modulescript/ModuleScriptHandler.java
--- a/src-core/src/org/openbravo/modulescript/ModuleScriptHandler.java Fri Apr
09 08:18:55 2010 +0200
+++ b/src-core/src/org/openbravo/modulescript/ModuleScriptHandler.java Wed Apr
14 20:07:49 2010 +0200
@@ -20,6 +20,7 @@
import org.apache.log4j.Logger;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
+import org.openbravo.buildvalidation.BuildValidationHandler;
public class ModuleScriptHandler extends Task {
private static final Logger log4j =
Logger.getLogger(ModuleScriptHandler.class);
@@ -33,10 +34,10 @@
if (moduleJavaPackage != null) {
// We will only be executing the ModuleScripts of a specific module
File moduleDir = new File(basedir, "modules/" + moduleJavaPackage +
"/build/classes");
- readClassFiles(classes, moduleDir);
+ BuildValidationHandler.readClassFiles(classes, moduleDir);
} else {
File coreBuildFolder = new File(basedir,
"src-util/modulescript/build/classes");
- readClassFiles(classes, coreBuildFolder);
+ BuildValidationHandler.readClassFiles(classes, coreBuildFolder);
File moduleFolder = new File(basedir, "modules");
File modFoldersA[] = moduleFolder.listFiles();
ArrayList<File> modFolders = new ArrayList<File>();
@@ -48,7 +49,7 @@
if (modFolder.isDirectory()) {
File validationFolder = new File(modFolder, "build/classes");
if (validationFolder.exists()) {
- readClassFiles(classes, validationFolder);
+ BuildValidationHandler.readClassFiles(classes, validationFolder);
}
}
}
@@ -76,31 +77,6 @@
new Object[0]);
}
- private static void readClassFiles(List<String> coreClasses, File file) {
- ArrayList<String> newClasses = new ArrayList<String>();
- readClassFilesExt(newClasses, file);
- Collections.sort(newClasses);
- coreClasses.addAll(newClasses);
- }
-
- private static void readClassFilesExt(List<String> coreClasses, File file) {
- if (!file.exists()) {
- return;
- }
- if (file.isDirectory()) {
- File[] files = file.listFiles();
- for (File f : files) {
- readClassFiles(coreClasses, f);
- }
- } else {
- if (file.getAbsolutePath().endsWith(".class")) {
- String fileName = file.getAbsolutePath();
- fileName = fileName.split("build" + File.separatorChar + "classes" +
File.separatorChar)[1];
- coreClasses.add(fileName.replace(".class",
"").replace(File.separatorChar, '.'));
- }
- }
- }
-
public File getBasedir() {
return basedir;
}
diff -r 511757e230d2 -r bfab11cae58d
src-core/src/org/openbravo/utils/OBRebuildAppender.java
--- a/src-core/src/org/openbravo/utils/OBRebuildAppender.java Fri Apr 09
08:18:55 2010 +0200
+++ b/src-core/src/org/openbravo/utils/OBRebuildAppender.java Wed Apr 14
20:07:49 2010 +0200
@@ -78,8 +78,15 @@
message = message.substring(0, 2997) + "...";
PreparedStatement ps = connection
.prepareStatement("INSERT INTO ad_error_log (ad_error_log_id,
ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby,
system_status, error_level, message, line_number) SELECT get_uuid(), '0', '0',
'Y', now(), '0', now(), '0', system_status, ?,?, to_number(?) FROM
ad_system_info");
- ps.setString(1, arg0.getLevel().toString());
- ps.setString(2, arg0.getMessage().toString());
+ String level = arg0.getLevel().toString();
+
+ // Warnings show when compiling are changed to level Info, so that
they don't appear in the
+ // rebuild window, because they are not relevant for common users
+ if (message.startsWith("Note: ")) {
+ level = Level.INFO.toString();
+ }
+ ps.setString(1, level);
+ ps.setString(2, message);
ps.setString(3, line_number);
ps.executeUpdate();
} catch (Exception e) {
diff -r 511757e230d2 -r bfab11cae58d src-db/database/lib/dbsourcemanager.jar
Binary file src-db/database/lib/dbsourcemanager.jar has changed
diff -r 511757e230d2 -r bfab11cae58d
src-db/database/model/functions/AD_GET_PROPERTY_VALUE.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/functions/AD_GET_PROPERTY_VALUE.xml Wed Apr 14
20:07:49 2010 +0200
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+ <database name="FUNCTION AD_GET_PROPERTY_VALUE">
+ <function name="AD_GET_PROPERTY_VALUE" type="NVARCHAR">
+ <parameter name="p_property_name" type="VARCHAR" mode="in">
+ <default/>
+ </parameter>
+ <parameter name="p_ad_client_id" type="VARCHAR" mode="in">
+ <default/>
+ </parameter>
+ <parameter name="p_ad_org_id" type="VARCHAR" mode="in">
+ <default/>
+ </parameter>
+
<body><![CDATA[/*************************************************************************
+* The contents of this file are subject to the Openbravo Public License
+* Version 1.0 (the "License"), being the Mozilla Public License
+* Version 1.1 with a permitted attribution clause; you may not use this
+* file except in compliance with the License. You may obtain a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License is distributed on an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific language governing rights and limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SLU
+* All portions are Copyright (C) 2010 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s): ______________________________________.
+************************************************************************/
+ propNumber NUMBER;
+ v_value nvarchar2(255);
+ v_useSelected char(1);
+BEGIN
+
+ select count(*)
+ into propNumber
+ from ad_property_configuration c
+ where c.property = p_PROPERTY_NAME
+ and ad_isorgincluded(p_ad_org_id, c.ad_org_id, p_ad_client_id) != -1
+ and ad_isorgincluded(p_ad_org_id, c.ad_org_id, p_ad_client_id) =
+ (select min(ad_isorgincluded(p_ad_org_id, c1.ad_org_id,
p_ad_client_id))
+ from ad_property_configuration c1
+ where c.property = p_PROPERTY_NAME
+ and ad_isorgincluded(p_ad_org_id, c1.ad_org_id, p_ad_client_id)
!= -1);
+
+ if propNumber = 0 then
+ return null;
+ elsif propNumber > 1 then
+ select count(*)
+ into propNumber
+ from ad_property_configuration c
+ where c.property = p_PROPERTY_NAME
+ and selected='Y'
+ and ad_isorgincluded(p_ad_org_id, c.ad_org_id, p_ad_client_id) != -1
+ and ad_isorgincluded(p_ad_org_id, c.ad_org_id, p_ad_client_id) =
+ (select min(ad_isorgincluded(p_ad_org_id, c1.ad_org_id,
p_ad_client_id))
+ from ad_property_configuration c1
+ where c.property = p_PROPERTY_NAME
+ and ad_isorgincluded(p_ad_org_id, c1.ad_org_id, p_ad_client_id)
!= -1);
+ if propNumber != 1 then
+ RAISE_APPLICATION_ERROR(-20000, p_PROPERTY_NAME||' @PropertyConflict@');
+ end if;
+ v_useSelected :='Y';
+ else
+ v_useSelected :='N';
+ end if;
+
+ select COALESCE(to_char(c.value), '-')
+ into v_value
+ from ad_property_configuration c
+ where c.property = p_PROPERTY_NAME
+ and (v_useSelected='N' or (v_useSelected = 'Y' and selected='Y'))
+ and ad_isorgincluded(p_ad_org_id, c.ad_org_id, p_ad_client_id) != -1
+ and ad_isorgincluded(p_ad_org_id, c.ad_org_id, p_ad_client_id) =
+ (select min(ad_isorgincluded(p_ad_org_id, c1.ad_org_id,
p_ad_client_id))
+ from ad_property_configuration c1
+ where c.property = p_PROPERTY_NAME
+ and ad_isorgincluded(p_ad_org_id, c1.ad_org_id, p_ad_client_id)
!= -1);
+ return v_value;
+END AD_GET_PROPERTY_VALUE
+]]></body>
+ </function>
+ </database>
diff -r 511757e230d2 -r bfab11cae58d
src-db/database/model/functions/C_BP_SOCREDITUSED_REFRESH.xml
--- a/src-db/database/model/functions/C_BP_SOCREDITUSED_REFRESH.xml Fri Apr
09 08:18:55 2010 +0200
+++ b/src-db/database/model/functions/C_BP_SOCREDITUSED_REFRESH.xml Wed Apr
14 20:07:49 2010 +0200
@@ -20,15 +20,23 @@
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************/
+ v_client_id c_bpartner.ad_client_id%TYPE;
+ v_org_id c_bpartner.ad_org_id%TYPE;
BEGIN
- UPDATE C_BPARTNER
- SET SO_CreditUsed=
- (SELECT COALESCE(SUM(C_Base_Convert((Amount - WriteOffAmt),
C_Currency_ID, AD_Client_ID, DocDate, AD_Org_ID)), 0) AS TOTAL
- FROM C_DEBT_PAYMENT_V
- WHERE C_BPartner_ID=p_BPartner_ID
- AND C_DEBT_PAYMENT_STATUS(C_SETTLEMENT_CANCEL_ID, Cancel_Processed,
Generate_Processed, IsPaid, IsValid, C_CashLine_ID, C_BankStatementLine_ID)='P'
- )
- WHERE C_BPartner_ID=p_BPartner_ID;
+ SELECT ad_client_id, ad_org_id
+ INTO v_client_id, v_org_id
+ FROM c_bpartner
+ WHERE c_bpartner_id = p_bpartner_id;
+ IF (AD_GET_PROPERTY_VALUE('CCU', v_client_id, v_org_id) IS NULL) THEN
+ UPDATE C_BPARTNER
+ SET SO_CreditUsed=
+ (SELECT COALESCE(SUM(C_Base_Convert((Amount - WriteOffAmt),
C_Currency_ID, AD_Client_ID, DocDate, AD_Org_ID)), 0) AS TOTAL
+ FROM C_DEBT_PAYMENT_V
+ WHERE C_BPartner_ID=p_BPartner_ID
+ AND C_DEBT_PAYMENT_STATUS(C_SETTLEMENT_CANCEL_ID, Cancel_Processed,
Generate_Processed, IsPaid, IsValid, C_CashLine_ID, C_BankStatementLine_ID)='P'
+ )
+ WHERE C_BPartner_ID=p_BPartner_ID;
+ END IF;
END C_BP_SOCREDITUSED_REFRESH
]]></body>
</function>
diff -r 511757e230d2 -r bfab11cae58d
src-db/database/model/functions/C_GENERATEPOFROMPROJECT.xml
--- a/src-db/database/model/functions/C_GENERATEPOFROMPROJECT.xml Fri Apr
09 08:18:55 2010 +0200
+++ b/src-db/database/model/functions/C_GENERATEPOFROMPROJECT.xml Wed Apr
14 20:07:49 2010 +0200
@@ -100,7 +100,8 @@
P.POREFERENCE,
P.SALESREP_ID,
P.CREATETEMPPRICELIST,
- P.DESCRIPTION
+ P.DESCRIPTION,
+ COALESCE(P.FIN_PAYMENTMETHOD_ID, BP.PO_PAYMENTMETHOD_ID) as
FIN_PAYMENTMETHOD_ID
FROM C_PROJECT P,
C_PROJECT_VENDOR V,
C_BPARTNER BP,
@@ -165,7 +166,7 @@
ISTAXINCLUDED, POSTED, PROCESSING, SALESREP_ID,
BILLTO_ID, POREFERENCE, C_CAMPAIGN_ID, C_PROJECT_ID,
AD_USER_ID, COPYFROM, C_INCOTERMS_ID, INCOTERMSDESCRIPTION,
- DATEPROMISED, DESCRIPTION
+ DATEPROMISED, DESCRIPTION, FIN_PAYMENTMETHOD_ID
)
VALUES
(
@@ -179,7 +180,7 @@
'N', 'N', 'N', Cur_SO.SALESREP_ID,
v_BillTo_ID, Cur_SO.POREFERENCE, Cur_SO.C_CAMPAIGN_ID,
Cur_SO.C_PROJECT_ID,
NULL, 'N', Cur_SO.C_INCOTERMS_ID, Cur_SO.INCOTERMS_DESCRIPTION,
- TRUNC(now(), 'DD'), Cur_SO.DESCRIPTION
+ TRUNC(now(), 'DD'), Cur_SO.DESCRIPTION, Cur_SO.FIN_PAYMENTMETHOD_ID
)
;
diff -r 511757e230d2 -r bfab11cae58d
src-db/database/model/functions/C_GENERATESOFROMPROJECT.xml
--- a/src-db/database/model/functions/C_GENERATESOFROMPROJECT.xml Fri Apr
09 08:18:55 2010 +0200
+++ b/src-db/database/model/functions/C_GENERATESOFROMPROJECT.xml Wed Apr
14 20:07:49 2010 +0200
@@ -25,6 +25,7 @@
v_Result NUMBER:=1; -- 0=failure
v_Record_ID VARCHAR2(32);
v_AD_User_ID VARCHAR2(32);
+ v_fin_paymentmethod_id C_BPARTNER.FIN_PAYMENTMETHOD_ID%TYPE;
TYPE RECORD IS REF CURSOR;
Cur_Parameter RECORD;
v_C_Order_ID VARCHAR2(32);
@@ -112,7 +113,7 @@
v_Billto_ID := C_GetBPLocationID(Cur_SO.C_BPartner_ID, 'B') ;
END IF;
- SELECT InvoiceRule INTO v_InvoiceRule
+ SELECT InvoiceRule, fin_paymentmethod_id INTO v_InvoiceRule,
v_fin_paymentmethod_id
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
